Skip to content

Merge https://github.com/filebrowser/filebrowser:master (ac46cf0) into oadp-dev - #29

Merged
openshift-merge-bot[bot] merged 12 commits into
migtools:oadp-devfrom
oadp-rebasebot:rebase-bot-oadp-dev
Jul 21, 2026
Merged

Merge https://github.com/filebrowser/filebrowser:master (ac46cf0) into oadp-dev#29
openshift-merge-bot[bot] merged 12 commits into
migtools:oadp-devfrom
oadp-rebasebot:rebase-bot-oadp-dev

Conversation

@oadp-rebasebot-app

@oadp-rebasebot-app oadp-rebasebot-app Bot commented Jul 20, 2026

Copy link
Copy Markdown

This is an automated rebase PR generated by RebaseBot.

Summary

  • Source: https://github.com/filebrowser/filebrowser:master
  • Destination: https://github.com/migtools/filebrowser:oadp-dev
  • 3 new upstream commits

tianrking and others added 12 commits July 17, 2026 20:14
@tianrking
fix(http): run upload hooks for directories (filebrowser#6034)
9b78324
@transifex-integration
chore: update translations (filebrowser#6019)
f078539 
Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
@TowyTowy @claude
fix: return error instead of panicking on an unreadable directory dur…
ac46cf0 
…ing copy (filebrowser#6020)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@oadp-maintainers
merge upstream/master into oadp-dev
0bca746
@mpryc @oadp-maintainers
UPSTREAM: <carry> Add disableUserProfile branding option
bcacb72 
New config option:
  --branding.disableUserProfile

This option allows to disable User Profile together
with User settings.

Signed-off-by: Michal Pryc <mpryc@redhat.com>
@mpryc @oadp-maintainers
UPSTREAM: <carry> Add defaultLoginUser branding option
75308d4 
New config option:
  --branding.defaultLoginUser "username"

This option allows to provide default Username, which will result
in hiding username field from the welcome page.

Signed-off-by: Michal Pryc <mpryc@redhat.com>
@mpryc @oadp-maintainers
UPSTREAM: <carry> Disable delete and rename from Help
ac93e6c 
Removes Help options "Delete" and "Rename" if the
following permissions are revoked from a particular
user:

  --perm.delete=false
  --perm.rename=false

Signed-off-by: Michal Pryc <mpryc@redhat.com>
@mpryc @oadp-maintainers
UPSTREAM: <carry> Containerfile to be used with UBI
3e96506 
Add multi-stage Containerfile for UBI-based builds.

Signed-off-by: Michal Pryc <mpryc@redhat.com>
@mpryc @oadp-maintainers
UPSTREAM: <carry> Add OWNERS file
d9b3f79 
Adds OWNERS file.

Signed-off-by: Michal Pryc <mpryc@redhat.com>
@mpryc @oadp-maintainers
UPSTREAM: <carry> Fix broken rebase of branding options
65e3108 
Fix downstream changes to match upstream refactored functions.

Signed-off-by: Michal Pryc <mpryc@redhat.com>
@mpryc @oadp-maintainers
UPSTREAM: <carry>: fix github actions
dd66610 
Disable Validate Title check (semantic commit PR titles are
not used downstream). Fix Go version to 1.25 and add oadp-*
branches to CI triggers.
@oadp-maintainers
Add dependabot config grouping all Go module dependency updates
3f001ee
@openshift-ci
openshift-ci Bot requested review from Joeavaikath and kaovilai July 20, 2026 13:53
@openshift-ci

openshift-ci Bot commented Jul 20, 2026

Copy link
Copy Markdown

Hi @oadp-rebasebot-app[bot]. Thanks for your PR.

I'm waiting for a migtools member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

weshayutin
weshayutin approved these changes Jul 21, 2026
View reviewed changes

@weshayutin weshayutin left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/LGTM

@openshift-ci openshift-ci Bot added the lgtm label Jul 21, 2026
@openshift-ci

openshift-ci Bot commented Jul 21, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: oadp-rebasebot-app[bot], weshayutin

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot
openshift-merge-bot Bot merged commit 4765d1d into migtools:oadp-dev Jul 21, 2026
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@weshayutin weshayutin weshayutin approved these changes
@Joeavaikath Joeavaikath Awaiting requested review from Joeavaikath
@kaovilai kaovilai Awaiting requested review from kaovilai

Assignees

@weshayutin weshayutin

Labels

approved lgtm needs-ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@weshayutin @tianrking @TowyTowy @oadp-maintainers @mpryc